Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 06:26:23 +0000 (23:26 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 06:26:23 +0000 (23:26 -0700)
commita88d8c092b670bf20db022fe87dfcc619c2920b0
treeb1abbb8b771aa995bd9517e69f2c292d6a214c29
parentac2d0377c9798ed98ff48f103703643fa7c12b9f
parent208c59c267a077789a4dca1feb2df77b0edcb95b
Merge from trunk.